xend: fix c/s 19510
authorKeir Fraser <keir.fraser@citrix.com>
Wed, 8 Apr 2009 08:02:22 +0000 (09:02 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Wed, 8 Apr 2009 08:02:22 +0000 (09:02 +0100)
Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
tools/python/xen/xend/server/pciif.py

index 92b32a3b45355f37d474df39b7e678832fd296a9..730274c31b8843792622765f7242766125308c75 100644 (file)
@@ -71,6 +71,10 @@ class PciController(DevController):
         pcidevid = 0
         vslots = ""
         for pci_config in config.get('devs', []):
+            vslot = pci_config.get('vslot')
+            if vslot is not None:
+                vslots = vslots + vslot + ";"
+
             domain = parse_hex(pci_config.get('domain', 0))
             bus = parse_hex(pci_config.get('bus', 0))
             slot = parse_hex(pci_config.get('slot', 0))
@@ -83,10 +87,6 @@ class PciController(DevController):
                 opts = reduce(lambda x, y: x+','+y, opts)
                 back['opts-%i' % pcidevid] = opts
 
-            vslot = pci_config.get('vslot')
-            if vslot is not None:
-                vslots = vslots + vslot + ";"
-
             back['dev-%i' % pcidevid] = "%04x:%02x:%02x.%01x" % \
                                         (domain, bus, slot, func)
             back['uuid-%i' % pcidevid] = pci_config.get('uuid', '')